Merge branch 'master' of https://github.com/justbur/emacs-which-key
authorjustbur <justin@burkett.cc>
Sat, 11 Jul 2015 17:27:45 +0000 (13:27 -0400)
committerjustbur <justin@burkett.cc>
Sat, 11 Jul 2015 17:27:45 +0000 (13:27 -0400)

Trivial merge